From 4a11acdc8c01369d2e1ad9c10fc1f821d721ab1a Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Thu, 23 Jan 2014 18:59:20 -0500 Subject: [PATCH] resources: move resources into a subdirectory --- gtk/Makefile.am | 77 ++++++++---------- gtk/gtk.gresource.xml | 70 ++++++++-------- gtk/gtkaboutdialog.c | 2 +- gtk/gtkappchooserdialog.c | 2 +- gtk/gtkappchooserwidget.c | 2 +- gtk/gtkapplication-quartz.c | 2 +- gtk/gtkassistant.c | 2 +- gtk/gtkcolorchooserdialog.c | 2 +- gtk/gtkcoloreditor.c | 2 +- gtk/gtkcssprovider.c | 4 +- gtk/gtkdialog.c | 2 +- gtk/gtkfilechooserbutton.c | 2 +- gtk/gtkfilechooserdefault.c | 2 +- gtk/gtkfilechooserdialog.c | 2 +- gtk/gtkfontbutton.c | 2 +- gtk/gtkfontchooserdialog.c | 2 +- gtk/gtkfontchooserwidget.c | 2 +- gtk/gtkinfobar.c | 2 +- gtk/gtklockbutton.c | 2 +- gtk/gtkmessagedialog.c | 2 +- gtk/gtkpagesetupunixdialog.c | 2 +- gtk/gtkpathbar.c | 2 +- gtk/gtkprintunixdialog.c | 2 +- gtk/gtkrecentchooserdefault.c | 2 +- gtk/gtkscalebutton.c | 2 +- gtk/gtksearchbar.c | 2 +- gtk/gtkstatusbar.c | 2 +- gtk/gtkvolumebutton.c | 2 +- gtk/{ => resources/cursor}/cursor_dnd_ask.png | Bin .../cursor}/cursor_dnd_copy.png | Bin .../cursor}/cursor_dnd_link.png | Bin .../cursor}/cursor_dnd_move.png | Bin .../cursor}/cursor_dnd_none.png | Bin gtk/{ => resources/theme}/gtk-default.css | 0 gtk/{ => resources/theme}/gtk-win32-base.css | 0 .../theme}/gtk-win32-classic.css | 0 gtk/{ => resources/theme}/gtk-win32-xp.css | 0 gtk/{ => resources/theme}/gtk-win32.css | 0 gtk/{ => resources/ui}/gtkaboutdialog.ui | 0 gtk/{ => resources/ui}/gtkaboutdialog.ui.h | 0 gtk/{ => resources/ui}/gtkappchooserdialog.ui | 0 .../ui}/gtkappchooserdialog.ui.h | 0 gtk/{ => resources/ui}/gtkappchooserwidget.ui | 0 .../ui}/gtkappchooserwidget.ui.h | 0 .../ui}/gtkapplication-quartz.ui | 0 .../ui}/gtkapplication-quartz.ui.h | 0 gtk/{ => resources/ui}/gtkassistant.ui | 0 gtk/{ => resources/ui}/gtkassistant.ui.h | 0 .../ui}/gtkcolorchooserdialog.ui | 0 .../ui}/gtkcolorchooserdialog.ui.h | 0 gtk/{ => resources/ui}/gtkcoloreditor.ui | 0 gtk/{ => resources/ui}/gtkcoloreditor.ui.h | 0 gtk/{ => resources/ui}/gtkdialog.ui | 0 gtk/{ => resources/ui}/gtkdialog.ui.h | 0 .../ui}/gtkfilechooserbutton.ui | 0 .../ui}/gtkfilechooserbutton.ui.h | 0 .../ui}/gtkfilechooserdefault.ui | 0 .../ui}/gtkfilechooserdefault.ui.h | 0 .../ui}/gtkfilechooserdialog.ui | 0 .../ui}/gtkfilechooserdialog.ui.h | 0 gtk/{ => resources/ui}/gtkfontbutton.ui | 0 gtk/{ => resources/ui}/gtkfontbutton.ui.h | 0 .../ui}/gtkfontchooserdialog.ui | 0 .../ui}/gtkfontchooserdialog.ui.h | 0 .../ui}/gtkfontchooserwidget.ui | 0 .../ui}/gtkfontchooserwidget.ui.h | 0 gtk/{ => resources/ui}/gtkinfobar.ui | 0 gtk/{ => resources/ui}/gtkinfobar.ui.h | 0 gtk/{ => resources/ui}/gtklockbutton.ui | 0 gtk/{ => resources/ui}/gtklockbutton.ui.h | 0 gtk/{ => resources/ui}/gtkmessagedialog.ui | 0 gtk/{ => resources/ui}/gtkmessagedialog.ui.h | 0 .../ui}/gtkpagesetupunixdialog.ui | 0 .../ui}/gtkpagesetupunixdialog.ui.h | 0 gtk/{ => resources/ui}/gtkpathbar.ui | 0 gtk/{ => resources/ui}/gtkpathbar.ui.h | 0 gtk/{ => resources/ui}/gtkprintunixdialog.ui | 0 .../ui}/gtkprintunixdialog.ui.h | 0 .../ui}/gtkrecentchooserdefault.ui | 0 .../ui}/gtkrecentchooserdefault.ui.h | 0 gtk/{ => resources/ui}/gtkscalebutton.ui | 0 gtk/{ => resources/ui}/gtkscalebutton.ui.h | 0 gtk/{ => resources/ui}/gtksearchbar.ui | 0 gtk/{ => resources/ui}/gtksearchbar.ui.h | 0 gtk/{ => resources/ui}/gtkstatusbar.ui | 0 gtk/{ => resources/ui}/gtkstatusbar.ui.h | 0 gtk/{ => resources/ui}/gtkvolumebutton.ui | 0 gtk/{ => resources/ui}/gtkvolumebutton.ui.h | 0 po-properties/POTFILES.skip | 72 ++++++++-------- po/POTFILES.in | 48 +++++------ po/POTFILES.skip | 36 ++++---- 91 files changed, 173 insertions(+), 184 deletions(-) rename gtk/{ => resources/cursor}/cursor_dnd_ask.png (100%) rename gtk/{ => resources/cursor}/cursor_dnd_copy.png (100%) rename gtk/{ => resources/cursor}/cursor_dnd_link.png (100%) rename gtk/{ => resources/cursor}/cursor_dnd_move.png (100%) rename gtk/{ => resources/cursor}/cursor_dnd_none.png (100%) rename gtk/{ => resources/theme}/gtk-default.css (100%) rename gtk/{ => resources/theme}/gtk-win32-base.css (100%) rename gtk/{ => resources/theme}/gtk-win32-classic.css (100%) rename gtk/{ => resources/theme}/gtk-win32-xp.css (100%) rename gtk/{ => resources/theme}/gtk-win32.css (100%) rename gtk/{ => resources/ui}/gtkaboutdialog.ui (100%) rename gtk/{ => resources/ui}/gtkaboutdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkappchooserdialog.ui (100%) rename gtk/{ => resources/ui}/gtkappchooserdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkappchooserwidget.ui (100%) rename gtk/{ => resources/ui}/gtkappchooserwidget.ui.h (100%) rename gtk/{ => resources/ui}/gtkapplication-quartz.ui (100%) rename gtk/{ => resources/ui}/gtkapplication-quartz.ui.h (100%) rename gtk/{ => resources/ui}/gtkassistant.ui (100%) rename gtk/{ => resources/ui}/gtkassistant.ui.h (100%) rename gtk/{ => resources/ui}/gtkcolorchooserdialog.ui (100%) rename gtk/{ => resources/ui}/gtkcolorchooserdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkcoloreditor.ui (100%) rename gtk/{ => resources/ui}/gtkcoloreditor.ui.h (100%) rename gtk/{ => resources/ui}/gtkdialog.ui (100%) rename gtk/{ => resources/ui}/gtkdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkfilechooserbutton.ui (100%) rename gtk/{ => resources/ui}/gtkfilechooserbutton.ui.h (100%) rename gtk/{ => resources/ui}/gtkfilechooserdefault.ui (100%) rename gtk/{ => resources/ui}/gtkfilechooserdefault.ui.h (100%) rename gtk/{ => resources/ui}/gtkfilechooserdialog.ui (100%) rename gtk/{ => resources/ui}/gtkfilechooserdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkfontbutton.ui (100%) rename gtk/{ => resources/ui}/gtkfontbutton.ui.h (100%) rename gtk/{ => resources/ui}/gtkfontchooserdialog.ui (100%) rename gtk/{ => resources/ui}/gtkfontchooserdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkfontchooserwidget.ui (100%) rename gtk/{ => resources/ui}/gtkfontchooserwidget.ui.h (100%) rename gtk/{ => resources/ui}/gtkinfobar.ui (100%) rename gtk/{ => resources/ui}/gtkinfobar.ui.h (100%) rename gtk/{ => resources/ui}/gtklockbutton.ui (100%) rename gtk/{ => resources/ui}/gtklockbutton.ui.h (100%) rename gtk/{ => resources/ui}/gtkmessagedialog.ui (100%) rename gtk/{ => resources/ui}/gtkmessagedialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkpagesetupunixdialog.ui (100%) rename gtk/{ => resources/ui}/gtkpagesetupunixdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkpathbar.ui (100%) rename gtk/{ => resources/ui}/gtkpathbar.ui.h (100%) rename gtk/{ => resources/ui}/gtkprintunixdialog.ui (100%) rename gtk/{ => resources/ui}/gtkprintunixdialog.ui.h (100%) rename gtk/{ => resources/ui}/gtkrecentchooserdefault.ui (100%) rename gtk/{ => resources/ui}/gtkrecentchooserdefault.ui.h (100%) rename gtk/{ => resources/ui}/gtkscalebutton.ui (100%) rename gtk/{ => resources/ui}/gtkscalebutton.ui.h (100%) rename gtk/{ => resources/ui}/gtksearchbar.ui (100%) rename gtk/{ => resources/ui}/gtksearchbar.ui.h (100%) rename gtk/{ => resources/ui}/gtkstatusbar.ui (100%) rename gtk/{ => resources/ui}/gtkstatusbar.ui.h (100%) rename gtk/{ => resources/ui}/gtkvolumebutton.ui (100%) rename gtk/{ => resources/ui}/gtkvolumebutton.ui.h (100%) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 2a676a0870..d0ceb1c51f 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1082,10 +1082,6 @@ gtk_extra_sources = \ paper_names_offsets.c \ gen-paper-names.c \ gtkstatusicon-quartz.c \ - gtk-win32-base.css \ - gtk-win32.css \ - gtk-win32-xp.css \ - gtk-win32-classic.css \ gtkversion.h.in \ gtkmarshalers.list \ fallback-c89.c @@ -1113,44 +1109,38 @@ pkgdata_DATA = gtkbuilder.rng EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng -DND_CURSORS = \ - cursor_dnd_ask.png \ - cursor_dnd_copy.png \ - cursor_dnd_link.png \ - cursor_dnd_move.png \ - cursor_dnd_none.png - -COMPOSITE_TEMPLATES = \ - gtkapplication-quartz.ui \ - gtkaboutdialog.ui \ - gtkappchooserdialog.ui \ - gtkappchooserwidget.ui \ - gtkassistant.ui \ - gtkcolorchooserdialog.ui \ - gtkcoloreditor.ui \ - gtkdialog.ui \ - gtkfilechooserbutton.ui \ - gtkfilechooserdefault.ui \ - gtkfilechooserdialog.ui \ - gtkfontbutton.ui \ - gtkfontchooserdialog.ui \ - gtkfontchooserwidget.ui \ - gtkinfobar.ui \ - gtklockbutton.ui \ - gtkmessagedialog.ui \ - gtkpagesetupunixdialog.ui \ - gtkpathbar.ui \ - gtkprintunixdialog.ui \ - gtkrecentchooserdefault.ui \ - gtksearchbar.ui \ - gtkscalebutton.ui \ - gtkstatusbar.ui \ - gtkvolumebutton.ui +COMPOSITE_TEMPLATES = \ + resources/ui/gtkapplication-quartz.ui \ + resources/ui/gtkaboutdialog.ui \ + resources/ui/gtkappchooserdialog.ui \ + resources/ui/gtkappchooserwidget.ui \ + resources/ui/gtkassistant.ui \ + resources/ui/gtkcolorchooserdialog.ui \ + resources/ui/gtkcoloreditor.ui \ + resources/ui/gtkdialog.ui \ + resources/ui/gtkfilechooserbutton.ui \ + resources/ui/gtkfilechooserdefault.ui \ + resources/ui/gtkfilechooserdialog.ui \ + resources/ui/gtkfontbutton.ui \ + resources/ui/gtkfontchooserdialog.ui \ + resources/ui/gtkfontchooserwidget.ui \ + resources/ui/gtkinfobar.ui \ + resources/ui/gtklockbutton.ui \ + resources/ui/gtkmessagedialog.ui \ + resources/ui/gtkpagesetupunixdialog.ui \ + resources/ui/gtkpathbar.ui \ + resources/ui/gtkprintunixdialog.ui \ + resources/ui/gtkrecentchooserdefault.ui \ + resources/ui/gtksearchbar.ui \ + resources/ui/gtkscalebutton.ui \ + resources/ui/gtkstatusbar.ui \ + resources/ui/gtkvolumebutton.ui template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h) %.ui.h: %.ui extract-strings$(BUILD_EXEEXT) - $(AM_V_GEN) ./extract-strings$(BUILD_EXEEXT) $< > $@ + $(AM_V_GEN) mkdir -p $(dir $@) \ + && ./extract-strings$(BUILD_EXEEXT) $< > $@ # # rules to generate built sources @@ -1196,12 +1186,13 @@ gtktypebuiltins.c: $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuilti && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc +resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/gtk.gresource.xml) gtkresources.h: gtk.gresource.xml $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register -gtkresources.c: gtk.gresource.xml gtk-default.css gtk-win32.css gtk-win32-xp.css gtk-win32-base.css gtk-win32-classic.css $(DND_CURSORS) $(COMPOSITE_TEMPLATES) $(template_headers) + --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register +gtkresources.c: gtk.gresource.xml $(resource_files) $(template_headers) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \ - --target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register + --target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-source --manual-register gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h @true @@ -1772,9 +1763,8 @@ endif mv gtkbuiltincache.h.tmp gtkbuiltincache.h EXTRA_DIST += \ + $(resource_files) \ $(STOCK_ICONS) \ - $(COMPOSITE_TEMPLATES) \ - $(DND_CURSORS) \ $(GENERATED_ICONS) \ gtk-win32.rc \ gtk-win32.rc.in \ @@ -1786,7 +1776,6 @@ EXTRA_DIST += \ gtksearchenginequartz.h \ gtk.gresource.xml \ gtkdbusinterfaces.xml \ - gtk-default.css \ gtk-keys.css.default \ gtk-keys.css.emacs \ gtk-keys.css.mac \ diff --git a/gtk/gtk.gresource.xml b/gtk/gtk.gresource.xml index ae37486289..7c430d9b1a 100644 --- a/gtk/gtk.gresource.xml +++ b/gtk/gtk.gresource.xml @@ -1,40 +1,40 @@ - gtk-default.css - gtk-win32.css - gtk-win32-xp.css - gtk-win32-base.css - gtk-win32-classic.css - cursor_dnd_ask.png - cursor_dnd_link.png - cursor_dnd_none.png - cursor_dnd_move.png - cursor_dnd_copy.png - gtkaboutdialog.ui - gtkappchooserdialog.ui - gtkappchooserwidget.ui - gtkassistant.ui - gtkcolorchooserdialog.ui - gtkcoloreditor.ui - gtkdialog.ui - gtkfilechooserbutton.ui - gtkfilechooserdefault.ui - gtkfilechooserdialog.ui - gtkfontbutton.ui - gtkfontchooserdialog.ui - gtkfontchooserwidget.ui - gtkinfobar.ui - gtklockbutton.ui - gtkmessagedialog.ui - gtkpagesetupunixdialog.ui - gtkpathbar.ui - gtkprintunixdialog.ui - gtkrecentchooserdefault.ui - gtksearchbar.ui - gtkscalebutton.ui - gtkstatusbar.ui - gtkvolumebutton.ui - gtkapplication-quartz.ui + theme/gtk-default.css + theme/gtk-win32.css + theme/gtk-win32-xp.css + theme/gtk-win32-base.css + theme/gtk-win32-classic.css + cursor/cursor_dnd_ask.png + cursor/cursor_dnd_link.png + cursor/cursor_dnd_none.png + cursor/cursor_dnd_move.png + cursor/cursor_dnd_copy.png + ui/gtkaboutdialog.ui + ui/gtkappchooserdialog.ui + ui/gtkappchooserwidget.ui + ui/gtkassistant.ui + ui/gtkcolorchooserdialog.ui + ui/gtkcoloreditor.ui + ui/gtkdialog.ui + ui/gtkfilechooserbutton.ui + ui/gtkfilechooserdefault.ui + ui/gtkfilechooserdialog.ui + ui/gtkfontbutton.ui + ui/gtkfontchooserdialog.ui + ui/gtkfontchooserwidget.ui + ui/gtkinfobar.ui + ui/gtklockbutton.ui + ui/gtkmessagedialog.ui + ui/gtkpagesetupunixdialog.ui + ui/gtkpathbar.ui + ui/gtkprintunixdialog.ui + ui/gtkrecentchooserdefault.ui + ui/gtksearchbar.ui + ui/gtkscalebutton.ui + ui/gtkstatusbar.ui + ui/gtkvolumebutton.ui + ui/gtkapplication-quartz.ui diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index 4558f95a26..40566f240c 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -583,7 +583,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkaboutdialog.ui"); + "/org/gtk/libgtk/ui/gtkaboutdialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkAboutDialog, stack); gtk_widget_class_bind_template_child_private (widget_class, GtkAboutDialog, stack_switcher); diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index 2bbd3c713b..d100e308b2 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -608,7 +608,7 @@ gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass) widget_class = GTK_WIDGET_CLASS (klass); gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkappchooserdialog.ui"); + "/org/gtk/libgtk/ui/gtkappchooserdialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserDialog, label); gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserDialog, show_more_button); gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserDialog, inner_box); diff --git a/gtk/gtkappchooserwidget.c b/gtk/gtkappchooserwidget.c index 6f3f160a18..213a8b25d6 100644 --- a/gtk/gtkappchooserwidget.c +++ b/gtk/gtkappchooserwidget.c @@ -1104,7 +1104,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass) */ widget_class = GTK_WIDGET_CLASS (klass); gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkappchooserwidget.ui"); + "/org/gtk/libgtk/ui/gtkappchooserwidget.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserWidget, program_list); gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserWidget, program_list_store); gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserWidget, column); diff --git a/gtk/gtkapplication-quartz.c b/gtk/gtkapplication-quartz.c index 9b1e0dedbc..6a11783e28 100644 --- a/gtk/gtkapplication-quartz.c +++ b/gtk/gtkapplication-quartz.c @@ -158,7 +158,7 @@ gtk_application_impl_quartz_startup (GtkApplicationImpl *impl, * The fact that we do this here ensures that we will always have the * app menu at index 0 in 'combined'. */ - builder = gtk_builder_new_from_resource ("/org/gtk/libgtk/gtkapplication-quartz.ui"); + builder = gtk_builder_new_from_resource ("/org/gtk/libgtk/ui/gtkapplication-quartz.ui"); gtk_application_set_app_menu (impl->application, G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu"))); g_object_unref (builder); } diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 5cf57b0bbb..178efb6cc4 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -430,7 +430,7 @@ gtk_assistant_class_init (GtkAssistantClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkassistant.ui"); + "/org/gtk/libgtk/ui/gtkassistant.ui"); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkAssistant, action_area); gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, content); diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index f9316b1e34..82e538bb3a 100644 --- a/gtk/gtkcolorchooserdialog.c +++ b/gtk/gtkcolorchooserdialog.c @@ -218,7 +218,7 @@ gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkcolorchooserdialog.ui"); + "/org/gtk/libgtk/ui/gtkcolorchooserdialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkColorChooserDialog, chooser); gtk_widget_class_bind_template_callback (widget_class, propagate_notify); gtk_widget_class_bind_template_callback (widget_class, color_activated_cb); diff --git a/gtk/gtkcoloreditor.c b/gtk/gtkcoloreditor.c index 5258a18660..3403d3d88d 100644 --- a/gtk/gtkcoloreditor.c +++ b/gtk/gtkcoloreditor.c @@ -462,7 +462,7 @@ gtk_color_editor_class_init (GtkColorEditorClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkcoloreditor.ui"); + "/org/gtk/libgtk/ui/gtkcoloreditor.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkColorEditor, overlay); gtk_widget_class_bind_template_child_private (widget_class, GtkColorEditor, grid); diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index e8245587e0..0bb2dec8a1 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -2756,9 +2756,9 @@ _gtk_css_provider_load_named (GtkCssProvider *provider, * themes. */ if (variant) - resource_path = g_strdup_printf ("/org/gtk/libgtk/%s-%s.css", name, variant); + resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s-%s.css", name, variant); else - resource_path = g_strdup_printf ("/org/gtk/libgtk/%s.css", name); + resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s.css", name); if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL)) { diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c index ebb331674e..b000daa1e2 100644 --- a/gtk/gtkdialog.c +++ b/gtk/gtkdialog.c @@ -587,7 +587,7 @@ gtk_dialog_class_init (GtkDialogClass *class) /* Bind class to template */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkdialog.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkdialog.ui"); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, vbox); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, headerbar); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, action_area); diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 21e19eb8ab..be60dcaa6e 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -470,7 +470,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkfilechooserbutton.ui"); + "/org/gtk/libgtk/ui/gtkfilechooserbutton.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserButton, model); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserButton, button); diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 2095d1fdf4..f3ce7aa463 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -7421,7 +7421,7 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkfilechooserdefault.ui"); + "/org/gtk/libgtk/ui/gtkfilechooserdefault.ui"); /* A *lot* of widgets that we need to handle .... */ gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserDefault, browse_widgets_box); diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c index 533c7b9230..019c5dfa8d 100644 --- a/gtk/gtkfilechooserdialog.c +++ b/gtk/gtkfilechooserdialog.c @@ -248,7 +248,7 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkfilechooserdialog.ui"); + "/org/gtk/libgtk/ui/gtkfilechooserdialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserDialog, widget); gtk_widget_class_bind_template_callback (widget_class, response_cb); diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c index 953cb0fe5e..0aaa4d3f26 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/gtkfontbutton.c @@ -544,7 +544,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass) /* Bind class to template */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkfontbutton.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkfontbutton.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkFontButton, font_label); gtk_widget_class_bind_template_child_private (widget_class, GtkFontButton, size_label); gtk_widget_class_bind_template_child_private (widget_class, GtkFontButton, font_size_box); diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c index d54d30a1b1..7400a5fba9 100644 --- a/gtk/gtkfontchooserdialog.c +++ b/gtk/gtkfontchooserdialog.c @@ -136,7 +136,7 @@ gtk_font_chooser_dialog_class_init (GtkFontChooserDialogClass *klass) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkfontchooserdialog.ui"); + "/org/gtk/libgtk/ui/gtkfontchooserdialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserDialog, fontchooser); gtk_widget_class_bind_template_callback (widget_class, font_activated_cb); diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index 16f964dd0b..8e1a6a4c1e 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -490,7 +490,7 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkfontchooserwidget.ui"); + "/org/gtk/libgtk/ui/gtkfontchooserwidget.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, search_entry); gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, family_face_list); diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 74e9b78625..a85412d6f2 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -579,7 +579,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass) /* Bind class to template */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkinfobar.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkinfobar.ui"); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, content_area); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, action_area); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, close_button); diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c index dbd2fb679a..de4e95d57e 100644 --- a/gtk/gtklockbutton.c +++ b/gtk/gtklockbutton.c @@ -306,7 +306,7 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass) /* Bind class to template */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtklockbutton.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtklockbutton.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, box); gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, image); gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, label_lock); diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c index 3eda28587e..83ff9ffb15 100644 --- a/gtk/gtkmessagedialog.c +++ b/gtk/gtkmessagedialog.c @@ -295,7 +295,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class) GTK_PARAM_READABLE)); /* Setup Composite data */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkmessagedialog.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkmessagedialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, image); gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, label); gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, secondary_label); diff --git a/gtk/gtkpagesetupunixdialog.c b/gtk/gtkpagesetupunixdialog.c index 4225f4c8fb..3b320ced32 100644 --- a/gtk/gtkpagesetupunixdialog.c +++ b/gtk/gtkpagesetupunixdialog.c @@ -161,7 +161,7 @@ gtk_page_setup_unix_dialog_class_init (GtkPageSetupUnixDialogClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkpagesetupunixdialog.ui"); + "/org/gtk/libgtk/ui/gtkpagesetupunixdialog.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkPageSetupUnixDialog, printer_list); gtk_widget_class_bind_template_child_private (widget_class, GtkPageSetupUnixDialog, page_setup_list); diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 3a1c821623..d8a1badcff 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -259,7 +259,7 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkpathbar.ui"); + "/org/gtk/libgtk/ui/gtkpathbar.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, up_slider_button); gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, down_slider_button); diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 531f7728f7..367a7fc3b2 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -481,7 +481,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkprintunixdialog.ui"); + "/org/gtk/libgtk/ui/gtkprintunixdialog.ui"); /* GtkTreeView / GtkTreeModel */ gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_treeview); diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c index 896ec5214a..5282f93bdf 100644 --- a/gtk/gtkrecentchooserdefault.c +++ b/gtk/gtkrecentchooserdefault.c @@ -346,7 +346,7 @@ _gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkrecentchooserdefault.ui"); + "/org/gtk/libgtk/ui/gtkrecentchooserdefault.ui"); gtk_widget_class_bind_template_child_private (widget_class, GtkRecentChooserDefault, filter_combo_hbox); gtk_widget_class_bind_template_child_private (widget_class, GtkRecentChooserDefault, filter_combo); diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c index 03491b0d5d..ab464e26aa 100644 --- a/gtk/gtkscalebutton.c +++ b/gtk/gtkscalebutton.c @@ -358,7 +358,7 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass) /* Bind class to template */ gtk_widget_class_set_template_from_resource (widget_class, - "/org/gtk/libgtk/gtkscalebutton.ui"); + "/org/gtk/libgtk/ui/gtkscalebutton.ui"); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkScaleButton, plus_button); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkScaleButton, minus_button); diff --git a/gtk/gtksearchbar.c b/gtk/gtksearchbar.c index d6ecdede0c..c5ee8bde55 100644 --- a/gtk/gtksearchbar.c +++ b/gtk/gtksearchbar.c @@ -421,7 +421,7 @@ gtk_search_bar_class_init (GtkSearchBarClass *klass) g_object_class_install_properties (object_class, LAST_PROPERTY, widget_props); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtksearchbar.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtksearchbar.ui"); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkSearchBar, tool_box); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkSearchBar, revealer); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkSearchBar, box_center); diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c index e2e423c521..6d94eca0c2 100644 --- a/gtk/gtkstatusbar.c +++ b/gtk/gtkstatusbar.c @@ -179,7 +179,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class) /* Bind class to template */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkstatusbar.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkstatusbar.ui"); gtk_widget_class_bind_template_child_internal_private (widget_class, GtkStatusbar, message_area); gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, frame); gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, label); diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c index c30d43baf4..dccda955a4 100644 --- a/gtk/gtkvolumebutton.c +++ b/gtk/gtkvolumebutton.c @@ -160,7 +160,7 @@ gtk_volume_button_class_init (GtkVolumeButtonClass *klass) /* Bind class to template */ - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkvolumebutton.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkvolumebutton.ui"); gtk_widget_class_bind_template_callback (widget_class, cb_query_tooltip); gtk_widget_class_bind_template_callback (widget_class, cb_value_changed); } diff --git a/gtk/cursor_dnd_ask.png b/gtk/resources/cursor/cursor_dnd_ask.png similarity index 100% rename from gtk/cursor_dnd_ask.png rename to gtk/resources/cursor/cursor_dnd_ask.png diff --git a/gtk/cursor_dnd_copy.png b/gtk/resources/cursor/cursor_dnd_copy.png similarity index 100% rename from gtk/cursor_dnd_copy.png rename to gtk/resources/cursor/cursor_dnd_copy.png diff --git a/gtk/cursor_dnd_link.png b/gtk/resources/cursor/cursor_dnd_link.png similarity index 100% rename from gtk/cursor_dnd_link.png rename to gtk/resources/cursor/cursor_dnd_link.png diff --git a/gtk/cursor_dnd_move.png b/gtk/resources/cursor/cursor_dnd_move.png similarity index 100% rename from gtk/cursor_dnd_move.png rename to gtk/resources/cursor/cursor_dnd_move.png diff --git a/gtk/cursor_dnd_none.png b/gtk/resources/cursor/cursor_dnd_none.png similarity index 100% rename from gtk/cursor_dnd_none.png rename to gtk/resources/cursor/cursor_dnd_none.png diff --git a/gtk/gtk-default.css b/gtk/resources/theme/gtk-default.css similarity index 100% rename from gtk/gtk-default.css rename to gtk/resources/theme/gtk-default.css diff --git a/gtk/gtk-win32-base.css b/gtk/resources/theme/gtk-win32-base.css similarity index 100% rename from gtk/gtk-win32-base.css rename to gtk/resources/theme/gtk-win32-base.css diff --git a/gtk/gtk-win32-classic.css b/gtk/resources/theme/gtk-win32-classic.css similarity index 100% rename from gtk/gtk-win32-classic.css rename to gtk/resources/theme/gtk-win32-classic.css diff --git a/gtk/gtk-win32-xp.css b/gtk/resources/theme/gtk-win32-xp.css similarity index 100% rename from gtk/gtk-win32-xp.css rename to gtk/resources/theme/gtk-win32-xp.css diff --git a/gtk/gtk-win32.css b/gtk/resources/theme/gtk-win32.css similarity index 100% rename from gtk/gtk-win32.css rename to gtk/resources/theme/gtk-win32.css diff --git a/gtk/gtkaboutdialog.ui b/gtk/resources/ui/gtkaboutdialog.ui similarity index 100% rename from gtk/gtkaboutdialog.ui rename to gtk/resources/ui/gtkaboutdialog.ui diff --git a/gtk/gtkaboutdialog.ui.h b/gtk/resources/ui/gtkaboutdialog.ui.h similarity index 100% rename from gtk/gtkaboutdialog.ui.h rename to gtk/resources/ui/gtkaboutdialog.ui.h diff --git a/gtk/gtkappchooserdialog.ui b/gtk/resources/ui/gtkappchooserdialog.ui similarity index 100% rename from gtk/gtkappchooserdialog.ui rename to gtk/resources/ui/gtkappchooserdialog.ui diff --git a/gtk/gtkappchooserdialog.ui.h b/gtk/resources/ui/gtkappchooserdialog.ui.h similarity index 100% rename from gtk/gtkappchooserdialog.ui.h rename to gtk/resources/ui/gtkappchooserdialog.ui.h diff --git a/gtk/gtkappchooserwidget.ui b/gtk/resources/ui/gtkappchooserwidget.ui similarity index 100% rename from gtk/gtkappchooserwidget.ui rename to gtk/resources/ui/gtkappchooserwidget.ui diff --git a/gtk/gtkappchooserwidget.ui.h b/gtk/resources/ui/gtkappchooserwidget.ui.h similarity index 100% rename from gtk/gtkappchooserwidget.ui.h rename to gtk/resources/ui/gtkappchooserwidget.ui.h diff --git a/gtk/gtkapplication-quartz.ui b/gtk/resources/ui/gtkapplication-quartz.ui similarity index 100% rename from gtk/gtkapplication-quartz.ui rename to gtk/resources/ui/gtkapplication-quartz.ui diff --git a/gtk/gtkapplication-quartz.ui.h b/gtk/resources/ui/gtkapplication-quartz.ui.h similarity index 100% rename from gtk/gtkapplication-quartz.ui.h rename to gtk/resources/ui/gtkapplication-quartz.ui.h diff --git a/gtk/gtkassistant.ui b/gtk/resources/ui/gtkassistant.ui similarity index 100% rename from gtk/gtkassistant.ui rename to gtk/resources/ui/gtkassistant.ui diff --git a/gtk/gtkassistant.ui.h b/gtk/resources/ui/gtkassistant.ui.h similarity index 100% rename from gtk/gtkassistant.ui.h rename to gtk/resources/ui/gtkassistant.ui.h diff --git a/gtk/gtkcolorchooserdialog.ui b/gtk/resources/ui/gtkcolorchooserdialog.ui similarity index 100% rename from gtk/gtkcolorchooserdialog.ui rename to gtk/resources/ui/gtkcolorchooserdialog.ui diff --git a/gtk/gtkcolorchooserdialog.ui.h b/gtk/resources/ui/gtkcolorchooserdialog.ui.h similarity index 100% rename from gtk/gtkcolorchooserdialog.ui.h rename to gtk/resources/ui/gtkcolorchooserdialog.ui.h diff --git a/gtk/gtkcoloreditor.ui b/gtk/resources/ui/gtkcoloreditor.ui similarity index 100% rename from gtk/gtkcoloreditor.ui rename to gtk/resources/ui/gtkcoloreditor.ui diff --git a/gtk/gtkcoloreditor.ui.h b/gtk/resources/ui/gtkcoloreditor.ui.h similarity index 100% rename from gtk/gtkcoloreditor.ui.h rename to gtk/resources/ui/gtkcoloreditor.ui.h diff --git a/gtk/gtkdialog.ui b/gtk/resources/ui/gtkdialog.ui similarity index 100% rename from gtk/gtkdialog.ui rename to gtk/resources/ui/gtkdialog.ui diff --git a/gtk/gtkdialog.ui.h b/gtk/resources/ui/gtkdialog.ui.h similarity index 100% rename from gtk/gtkdialog.ui.h rename to gtk/resources/ui/gtkdialog.ui.h diff --git a/gtk/gtkfilechooserbutton.ui b/gtk/resources/ui/gtkfilechooserbutton.ui similarity index 100% rename from gtk/gtkfilechooserbutton.ui rename to gtk/resources/ui/gtkfilechooserbutton.ui diff --git a/gtk/gtkfilechooserbutton.ui.h b/gtk/resources/ui/gtkfilechooserbutton.ui.h similarity index 100% rename from gtk/gtkfilechooserbutton.ui.h rename to gtk/resources/ui/gtkfilechooserbutton.ui.h diff --git a/gtk/gtkfilechooserdefault.ui b/gtk/resources/ui/gtkfilechooserdefault.ui similarity index 100% rename from gtk/gtkfilechooserdefault.ui rename to gtk/resources/ui/gtkfilechooserdefault.ui diff --git a/gtk/gtkfilechooserdefault.ui.h b/gtk/resources/ui/gtkfilechooserdefault.ui.h similarity index 100% rename from gtk/gtkfilechooserdefault.ui.h rename to gtk/resources/ui/gtkfilechooserdefault.ui.h diff --git a/gtk/gtkfilechooserdialog.ui b/gtk/resources/ui/gtkfilechooserdialog.ui similarity index 100% rename from gtk/gtkfilechooserdialog.ui rename to gtk/resources/ui/gtkfilechooserdialog.ui diff --git a/gtk/gtkfilechooserdialog.ui.h b/gtk/resources/ui/gtkfilechooserdialog.ui.h similarity index 100% rename from gtk/gtkfilechooserdialog.ui.h rename to gtk/resources/ui/gtkfilechooserdialog.ui.h diff --git a/gtk/gtkfontbutton.ui b/gtk/resources/ui/gtkfontbutton.ui similarity index 100% rename from gtk/gtkfontbutton.ui rename to gtk/resources/ui/gtkfontbutton.ui diff --git a/gtk/gtkfontbutton.ui.h b/gtk/resources/ui/gtkfontbutton.ui.h similarity index 100% rename from gtk/gtkfontbutton.ui.h rename to gtk/resources/ui/gtkfontbutton.ui.h diff --git a/gtk/gtkfontchooserdialog.ui b/gtk/resources/ui/gtkfontchooserdialog.ui similarity index 100% rename from gtk/gtkfontchooserdialog.ui rename to gtk/resources/ui/gtkfontchooserdialog.ui diff --git a/gtk/gtkfontchooserdialog.ui.h b/gtk/resources/ui/gtkfontchooserdialog.ui.h similarity index 100% rename from gtk/gtkfontchooserdialog.ui.h rename to gtk/resources/ui/gtkfontchooserdialog.ui.h diff --git a/gtk/gtkfontchooserwidget.ui b/gtk/resources/ui/gtkfontchooserwidget.ui similarity index 100% rename from gtk/gtkfontchooserwidget.ui rename to gtk/resources/ui/gtkfontchooserwidget.ui diff --git a/gtk/gtkfontchooserwidget.ui.h b/gtk/resources/ui/gtkfontchooserwidget.ui.h similarity index 100% rename from gtk/gtkfontchooserwidget.ui.h rename to gtk/resources/ui/gtkfontchooserwidget.ui.h diff --git a/gtk/gtkinfobar.ui b/gtk/resources/ui/gtkinfobar.ui similarity index 100% rename from gtk/gtkinfobar.ui rename to gtk/resources/ui/gtkinfobar.ui diff --git a/gtk/gtkinfobar.ui.h b/gtk/resources/ui/gtkinfobar.ui.h similarity index 100% rename from gtk/gtkinfobar.ui.h rename to gtk/resources/ui/gtkinfobar.ui.h diff --git a/gtk/gtklockbutton.ui b/gtk/resources/ui/gtklockbutton.ui similarity index 100% rename from gtk/gtklockbutton.ui rename to gtk/resources/ui/gtklockbutton.ui diff --git a/gtk/gtklockbutton.ui.h b/gtk/resources/ui/gtklockbutton.ui.h similarity index 100% rename from gtk/gtklockbutton.ui.h rename to gtk/resources/ui/gtklockbutton.ui.h diff --git a/gtk/gtkmessagedialog.ui b/gtk/resources/ui/gtkmessagedialog.ui similarity index 100% rename from gtk/gtkmessagedialog.ui rename to gtk/resources/ui/gtkmessagedialog.ui diff --git a/gtk/gtkmessagedialog.ui.h b/gtk/resources/ui/gtkmessagedialog.ui.h similarity index 100% rename from gtk/gtkmessagedialog.ui.h rename to gtk/resources/ui/gtkmessagedialog.ui.h diff --git a/gtk/gtkpagesetupunixdialog.ui b/gtk/resources/ui/gtkpagesetupunixdialog.ui similarity index 100% rename from gtk/gtkpagesetupunixdialog.ui rename to gtk/resources/ui/gtkpagesetupunixdialog.ui diff --git a/gtk/gtkpagesetupunixdialog.ui.h b/gtk/resources/ui/gtkpagesetupunixdialog.ui.h similarity index 100% rename from gtk/gtkpagesetupunixdialog.ui.h rename to gtk/resources/ui/gtkpagesetupunixdialog.ui.h diff --git a/gtk/gtkpathbar.ui b/gtk/resources/ui/gtkpathbar.ui similarity index 100% rename from gtk/gtkpathbar.ui rename to gtk/resources/ui/gtkpathbar.ui diff --git a/gtk/gtkpathbar.ui.h b/gtk/resources/ui/gtkpathbar.ui.h similarity index 100% rename from gtk/gtkpathbar.ui.h rename to gtk/resources/ui/gtkpathbar.ui.h diff --git a/gtk/gtkprintunixdialog.ui b/gtk/resources/ui/gtkprintunixdialog.ui similarity index 100% rename from gtk/gtkprintunixdialog.ui rename to gtk/resources/ui/gtkprintunixdialog.ui diff --git a/gtk/gtkprintunixdialog.ui.h b/gtk/resources/ui/gtkprintunixdialog.ui.h similarity index 100% rename from gtk/gtkprintunixdialog.ui.h rename to gtk/resources/ui/gtkprintunixdialog.ui.h diff --git a/gtk/gtkrecentchooserdefault.ui b/gtk/resources/ui/gtkrecentchooserdefault.ui similarity index 100% rename from gtk/gtkrecentchooserdefault.ui rename to gtk/resources/ui/gtkrecentchooserdefault.ui diff --git a/gtk/gtkrecentchooserdefault.ui.h b/gtk/resources/ui/gtkrecentchooserdefault.ui.h similarity index 100% rename from gtk/gtkrecentchooserdefault.ui.h rename to gtk/resources/ui/gtkrecentchooserdefault.ui.h diff --git a/gtk/gtkscalebutton.ui b/gtk/resources/ui/gtkscalebutton.ui similarity index 100% rename from gtk/gtkscalebutton.ui rename to gtk/resources/ui/gtkscalebutton.ui diff --git a/gtk/gtkscalebutton.ui.h b/gtk/resources/ui/gtkscalebutton.ui.h similarity index 100% rename from gtk/gtkscalebutton.ui.h rename to gtk/resources/ui/gtkscalebutton.ui.h diff --git a/gtk/gtksearchbar.ui b/gtk/resources/ui/gtksearchbar.ui similarity index 100% rename from gtk/gtksearchbar.ui rename to gtk/resources/ui/gtksearchbar.ui diff --git a/gtk/gtksearchbar.ui.h b/gtk/resources/ui/gtksearchbar.ui.h similarity index 100% rename from gtk/gtksearchbar.ui.h rename to gtk/resources/ui/gtksearchbar.ui.h diff --git a/gtk/gtkstatusbar.ui b/gtk/resources/ui/gtkstatusbar.ui similarity index 100% rename from gtk/gtkstatusbar.ui rename to gtk/resources/ui/gtkstatusbar.ui diff --git a/gtk/gtkstatusbar.ui.h b/gtk/resources/ui/gtkstatusbar.ui.h similarity index 100% rename from gtk/gtkstatusbar.ui.h rename to gtk/resources/ui/gtkstatusbar.ui.h diff --git a/gtk/gtkvolumebutton.ui b/gtk/resources/ui/gtkvolumebutton.ui similarity index 100% rename from gtk/gtkvolumebutton.ui rename to gtk/resources/ui/gtkvolumebutton.ui diff --git a/gtk/gtkvolumebutton.ui.h b/gtk/resources/ui/gtkvolumebutton.ui.h similarity index 100% rename from gtk/gtkvolumebutton.ui.h rename to gtk/resources/ui/gtkvolumebutton.ui.h diff --git a/po-properties/POTFILES.skip b/po-properties/POTFILES.skip index 0cdad83413..0f735dda6c 100644 --- a/po-properties/POTFILES.skip +++ b/po-properties/POTFILES.skip @@ -49,42 +49,42 @@ examples/application9/prefs.ui examples/application9/window.ui examples/bloatpad.c examples/plugman.c -gtk/gtkaboutdialog.ui -gtk/gtkaboutdialog.ui.h -gtk/gtkappchooserdialog.ui -gtk/gtkappchooserdialog.ui.h -gtk/gtkapplication-quartz.ui -gtk/gtkapplication-quartz.ui.h -gtk/gtkassistant.ui -gtk/gtkassistant.ui.h -gtk/gtkcolorchooserdialog.ui -gtk/gtkcolorchooserdialog.ui.h -gtk/gtkcoloreditor.ui -gtk/gtkcoloreditor.ui.h -gtk/gtkfilechooserbutton.ui -gtk/gtkfilechooserbutton.ui.h -gtk/gtkfilechooserdefault.ui -gtk/gtkfilechooserdefault.ui.h -gtk/gtkfontbutton.ui -gtk/gtkfontbutton.ui.h -gtk/gtkfontchooserdialog.ui -gtk/gtkfontchooserdialog.ui.h -gtk/gtkfontchooserwidget.ui -gtk/gtkfontchooserwidget.ui.h -gtk/gtklockbutton.ui -gtk/gtklockbutton.ui.h -gtk/gtkmessagedialog.ui -gtk/gtkmessagedialog.ui.h -gtk/gtkpagesetupunixdialog.ui -gtk/gtkpagesetupunixdialog.ui.h -gtk/gtkpathbar.ui -gtk/gtkpathbar.ui.h -gtk/gtkprintunixdialog.ui -gtk/gtkprintunixdialog.ui.h -gtk/gtkrecentchooserdefault.ui -gtk/gtkrecentchooserdefault.ui.h -gtk/gtkvolumebutton.ui -gtk/gtkvolumebutton.ui.h +gtk/resources/ui/gtkaboutdialog.ui +gtk/resources/ui/gtkaboutdialog.ui.h +gtk/resources/ui/gtkappchooserdialog.ui +gtk/resources/ui/gtkappchooserdialog.ui.h +gtk/resources/ui/gtkapplication-quartz.ui +gtk/resources/ui/gtkapplication-quartz.ui.h +gtk/resources/ui/gtkassistant.ui +gtk/resources/ui/gtkassistant.ui.h +gtk/resources/ui/gtkcolorchooserdialog.ui +gtk/resources/ui/gtkcolorchooserdialog.ui.h +gtk/resources/ui/gtkcoloreditor.ui +gtk/resources/ui/gtkcoloreditor.ui.h +gtk/resources/ui/gtkfilechooserbutton.ui +gtk/resources/ui/gtkfilechooserbutton.ui.h +gtk/resources/ui/gtkfilechooserdefault.ui +gtk/resources/ui/gtkfilechooserdefault.ui.h +gtk/resources/ui/gtkfontbutton.ui +gtk/resources/ui/gtkfontbutton.ui.h +gtk/resources/ui/gtkfontchooserdialog.ui +gtk/resources/ui/gtkfontchooserdialog.ui.h +gtk/resources/ui/gtkfontchooserwidget.ui +gtk/resources/ui/gtkfontchooserwidget.ui.h +gtk/resources/ui/gtklockbutton.ui +gtk/resources/ui/gtklockbutton.ui.h +gtk/resources/ui/gtkmessagedialog.ui +gtk/resources/ui/gtkmessagedialog.ui.h +gtk/resources/ui/gtkpagesetupunixdialog.ui +gtk/resources/ui/gtkpagesetupunixdialog.ui.h +gtk/resources/ui/gtkpathbar.ui +gtk/resources/ui/gtkpathbar.ui.h +gtk/resources/ui/gtkprintunixdialog.ui +gtk/resources/ui/gtkprintunixdialog.ui.h +gtk/resources/ui/gtkrecentchooserdefault.ui +gtk/resources/ui/gtkrecentchooserdefault.ui.h +gtk/resources/ui/gtkvolumebutton.ui +gtk/resources/ui/gtkvolumebutton.ui.h tests/testfilechooser.c testsuite/a11y/accessible-name.ui testsuite/a11y/assistant.ui diff --git a/po/POTFILES.in b/po/POTFILES.in index 18d94f8969..be696122e6 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -289,27 +289,27 @@ modules/printbackends/file/gtkprintbackendfile.c modules/printbackends/lpr/gtkprintbackendlpr.c modules/printbackends/papi/gtkprintbackendpapi.c modules/printbackends/test/gtkprintbackendtest.c -gtk/gtkaboutdialog.ui.h -gtk/gtkappchooserdialog.ui.h -gtk/gtkappchooserwidget.ui.h -gtk/gtkapplication-quartz.ui.h -gtk/gtkassistant.ui.h -gtk/gtkcolorchooserdialog.ui.h -gtk/gtkcoloreditor.ui.h -gtk/gtkdialog.ui.h -gtk/gtkfilechooserbutton.ui.h -gtk/gtkfilechooserdefault.ui.h -gtk/gtkfilechooserdialog.ui.h -gtk/gtkfontbutton.ui.h -gtk/gtkfontchooserdialog.ui.h -gtk/gtkfontchooserwidget.ui.h -gtk/gtkinfobar.ui.h -gtk/gtklockbutton.ui.h -gtk/gtkmessagedialog.ui.h -gtk/gtkpagesetupunixdialog.ui.h -gtk/gtkpathbar.ui.h -gtk/gtkprintunixdialog.ui.h -gtk/gtkrecentchooserdefault.ui.h -gtk/gtkscalebutton.ui.h -gtk/gtkstatusbar.ui.h -gtk/gtkvolumebutton.ui.h +gtk/resources/ui/gtkaboutdialog.ui.h +gtk/resources/ui/gtkappchooserdialog.ui.h +gtk/resources/ui/gtkappchooserwidget.ui.h +gtk/resources/ui/gtkapplication-quartz.ui.h +gtk/resources/ui/gtkassistant.ui.h +gtk/resources/ui/gtkcolorchooserdialog.ui.h +gtk/resources/ui/gtkcoloreditor.ui.h +gtk/resources/ui/gtkdialog.ui.h +gtk/resources/ui/gtkfilechooserbutton.ui.h +gtk/resources/ui/gtkfilechooserdefault.ui.h +gtk/resources/ui/gtkfilechooserdialog.ui.h +gtk/resources/ui/gtkfontbutton.ui.h +gtk/resources/ui/gtkfontchooserdialog.ui.h +gtk/resources/ui/gtkfontchooserwidget.ui.h +gtk/resources/ui/gtkinfobar.ui.h +gtk/resources/ui/gtklockbutton.ui.h +gtk/resources/ui/gtkmessagedialog.ui.h +gtk/resources/ui/gtkpagesetupunixdialog.ui.h +gtk/resources/ui/gtkpathbar.ui.h +gtk/resources/ui/gtkprintunixdialog.ui.h +gtk/resources/ui/gtkrecentchooserdefault.ui.h +gtk/resources/ui/gtkscalebutton.ui.h +gtk/resources/ui/gtkstatusbar.ui.h +gtk/resources/ui/gtkvolumebutton.ui.h diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 0f4229f3a3..969f8e60ed 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -49,24 +49,24 @@ examples/application9/prefs.ui examples/application9/window.ui examples/bloatpad.c examples/plugman.c -gtk/gtkaboutdialog.ui -gtk/gtkappchooserdialog.ui -gtk/gtkapplication-quartz.ui -gtk/gtkassistant.ui -gtk/gtkcolorchooserdialog.ui -gtk/gtkcoloreditor.ui -gtk/gtkfilechooserbutton.ui -gtk/gtkfilechooserdefault.ui -gtk/gtkfontbutton.ui -gtk/gtkfontchooserdialog.ui -gtk/gtkfontchooserwidget.ui -gtk/gtklockbutton.ui -gtk/gtkmessagedialog.ui -gtk/gtkpagesetupunixdialog.ui -gtk/gtkpathbar.ui -gtk/gtkprintunixdialog.ui -gtk/gtkrecentchooserdefault.ui -gtk/gtkvolumebutton.ui +gtk/resources/ui/gtkaboutdialog.ui +gtk/resources/ui/gtkappchooserdialog.ui +gtk/resources/ui/gtkapplication-quartz.ui +gtk/resources/ui/gtkassistant.ui +gtk/resources/ui/gtkcolorchooserdialog.ui +gtk/resources/ui/gtkcoloreditor.ui +gtk/resources/ui/gtkfilechooserbutton.ui +gtk/resources/ui/gtkfilechooserdefault.ui +gtk/resources/ui/gtkfontbutton.ui +gtk/resources/ui/gtkfontchooserdialog.ui +gtk/resources/ui/gtkfontchooserwidget.ui +gtk/resources/ui/gtklockbutton.ui +gtk/resources/ui/gtkmessagedialog.ui +gtk/resources/ui/gtkpagesetupunixdialog.ui +gtk/resources/ui/gtkpathbar.ui +gtk/resources/ui/gtkprintunixdialog.ui +gtk/resources/ui/gtkrecentchooserdefault.ui +gtk/resources/ui/gtkvolumebutton.ui gtk/paper_names.c tests/testfilechooser.c testsuite/a11y/accessible-name.ui -- 2.30.2